Update upstream source from tag 'upstream/2018.4'
authorSimon McVittie <smcv@debian.org>
Sat, 24 Mar 2018 18:19:39 +0000 (18:19 +0000)
committerSimon McVittie <smcv@debian.org>
Sat, 24 Mar 2018 18:19:39 +0000 (18:19 +0000)
Update to upstream version '2018.4'
with Debian dir 6c6b7014c25043488872be9a7f262ff8d64b5669


Trivial merge